tree 3b51c66427df306daa38fce5140dcb99e14814ef
parent 9b40be2a6e04ec82e9e3c24880a8bced446ecfda
parent fb2f28271b79b1725cc52e6620bf17c4e94d38cd
author The Android Open Source Project <initial-contribution@android.com> 1349793064 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349793064 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I71bc832ed089ae690aecfc96672986fc09712a58