tree 38aabd506f2c732e9d863c8bebc98b6bab51c6f6
parent 61ebd5e3e28372e497a5bcf7cc8212007d38e5a6
parent 4dca94e4697c42216ec32c11f9f1dabb2f443703
author The Android Open Source Project <initial-contribution@android.com> 1349450197 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349450197 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I9545f52b76d36bfbdf29cd270d0af200cb2d51fe