tree 6568ce3f980efa2bee35092eaf880fe62bf52329
parent 37dc9a20f045436ef9ff8a15f70eda746f411ab4
parent c536a0fe5015c58b5e8b33a72bb3af5c3339ff71
author The Android Open Source Project <initial-contribution@android.com> 1354895559 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354895559 -0800

Reconcile with jb-mr1.1-release - do not merge

Change-Id: If99ecfdce01c838237eaa9ae3e403fcee0a5892c