Skip to content
Commit 40f20235 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Reconcile with jb-mr2-release - do not merge 

Change-Id: I6ca669228f4605710cf3c67176f982d673f5c2cd
parents 9551bcfd b301684e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment