tree 46bd1577e9e28e01a6bfa4b88b684c60fa97b0bd
parent 7beccc08e3a90afd0732a187ba48ea5daaa5f9bb
parent 23a465305af0789d69b446b51b0787261e8f6053
author The Android Open Source Project <initial-contribution@android.com> 1348506796 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1348506797 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I4a8eedf65186e150638048de58ef12a0ffe6fc98