| commit | 60a1d1df9bd3e6c2583dd14e2746900b22a379af | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 19 14:33:42 2012 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 19 14:33:42 2012 -0800 |
| tree | 4da76af1a81570a822e83765ef45291f158876d1 | |
| parent | 87a6043e9330917f914a1ba4213c4ae101df8003 [diff] | |
| parent | 6445344dbaf08ec4d8fbf6aeeffdf29faed64e78 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: Ic1386b1ea77872e99819f8b7132a8419fc41cb5e