| commit | aef6938a920f9f1bb56ccd464995798d43b5d8c1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 06 13:34:24 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 06 13:34:24 2012 -0700 |
| tree | f95c24141603250e3a046b147874d2919cbe9627 | |
| parent | 15c12af81f6055858f4b0edbd6c0c903286108c6 [diff] | |
| parent | 2dbd17f434e28acf4684322760cef66e49c8a0e8 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I94c2ae5ee6239ab6d058d0afabf896780bbbe838