Skip to content
Commit 5871434e 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: I29c033be91cbfe80951c043ac96208d894fbda60
parents dce21a59 9c7ee73d
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