| commit | 14418170ff49169130b05e51ac923206de0568e1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 15:41:04 2012 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 15:41:04 2012 -0800 |
| tree | b6a3f49ddf669c52160c0a9ed0651158c3131a04 | |
| parent | 49e27d5f9d77316350be6a119bad717d38ce5d95 [diff] | |
| parent | c8c2da1d00cb4a4a46136ce75cf659aced455f8c [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: Ib7a3e7b3af9ef848b763cf498c6757ad5658fc80