tree e4ab5c54c009ca953c46cb71c78fac9c24883ee9
parent 1fd1ed869eb84c7976ba0b3ccd3c755d5bf9a5b2
parent 7951e688b3873d2cadb65c736096203d329a50ee
author The Android Open Source Project <initial-contribution@android.com> 1365691534 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1365691534 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I570dd02b7ebab54dcdf36b3a71aa5f4ed594ce23