commit | fbe1ff366ff80c2dc4543ada8b958848c2649dcc | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 04 07:47:32 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 04 07:47:32 2012 -0700 |
tree | 85d6efbab32b6f07e3d5e26468e59c833891b02f | |
parent | e8b88b72bdb9a99f58f6f5a289b307aad56ea374 [diff] | |
parent | 1c723d9eac181507e4a24ff8e8806c7fbdd0c481 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ia1e6413d3d45634a4b91dc8a528c991a05ec3627