tree 83c10272741a15805486e3e6beccb6066b8a8ed0
parent 2d702b8886e52d08164790e9752b05b186eee030
parent f1237be0a5bd48fec5cc7696aab836f812ee7cac
author The Android Open Source Project <initial-contribution@android.com> 1346943287 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1346943287 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I017b8998e27d05a8763bc2b301d17f8fe6a31a68