| commit | a34f71153cebf524807767886dad4defc32d8d4d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 08:54:21 2012 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 08:54:21 2012 -0800 |
| tree | 0599b8c1bb574908f1254251b9ac532a2c57f4c9 | |
| parent | 6297b872cf131a35b1f6d98f207e08f37e4c9128 [diff] | |
| parent | 8adb8f081f31911059a96bd426de01a4d3128e1a [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ie06c8378e80e9d7c74b6cada9c7cbac06aaa3d20