commit | d971fd4b18fc9958b72372da046d5c87473c2e3b | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 22 13:40:20 2013 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 22 13:40:20 2013 -0800 |
tree | 131dca407d801876af2ddf019e43359b12a452ae | |
parent | 0e48b70f1539f67f6baad9ffd4a907b01f7eb4af [diff] | |
parent | e1d91b1ede07f2a8a4d327556cb7d6e5c2247ca2 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I462183714b491c5e8f32d29f353b11cb50764cf3