tree 34000de630a593d4195406b84ce2c200b6d3758a
parent b4199b869bcc3b8dff6572c682fe09f74660268e
parent 16dfdcc0c12a143ff58784c6f4f340ea625fe7bb
parent dbf1b57d3fbb993386b1e296e3a0256b2e0f38e8
parent 783924163e36db162d7b40e4645bf0ccfb61ca6d
author The Android Open Source Project <initial-contribution@android.com> 1347056457 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1347056458 -0700

Reconcile with jb-nakasig-release jb-mr0-release jb-release - do not merge

Change-Id: Ibb66fb1e9c4c3066c8a27139922300a511ff9e7b