| commit | c9b5f99c1d1404b02b123771357be32430363ba2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 10 15:19:47 2012 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 10 15:19:47 2012 -0800 |
| tree | 9bd9590588fe4110f31113d9a3b495ccb6542a7a | |
| parent | 68066a78352ea6b147767e84a5481764f0054f2b [diff] | |
| parent | 5fb06075df25aa9e49d12848c1da3a5c1a65a6ca [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I9438d179ff8a407f87b5b501d4ea1d006f2fb77c