tree 2bf61e5bf7a3cb252c3f9703912bde83bf9240bb
parent 8c0e5df8a91955356325a6d526a18f2e1c2196b3
parent f48fa4adc27def6277ddb81a531dfa4800838560
author The Android Open Source Project <initial-contribution@android.com> 1351700182 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1351700182 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I9f43c1a10d1df3c9aa98d21d3dc8689da99fe1b8