tree 0c5089ae189a34edecc932817b74fe3639acd45b
parent 7382f81fba895f1ac970ac2fad875f35836b8082
parent e270d6c1b5c9095a07910560734a7d40e133689b
author The Android Open Source Project <initial-contribution@android.com> 1345904302 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1345904303 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I91572ae0a96d0f7450b8afff1b32167c8dd0c086