| commit | 36b46fd13c905357972c73a89a637abcd79db4b1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Feb 05 13:45:23 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 05 13:45:23 2013 -0800 |
| tree | edb22f2d69284700643785e309b65b41c2ea6d4f | |
| parent | 08a89cb253443c16ad836f942553e64a7c83ff02 [diff] | |
| parent | c43e8a9cdfce2852d6eaed0d2d0ad8a6205b0f40 [diff] |
am c43e8a9c: (-s ours) Reconcile with jb-mr1.1-release - do not merge # By The Android Automerger # Via The Android Automerger (11) and The Android Open Source Project (1) * commit 'c43e8a9cdfce2852d6eaed0d2d0ad8a6205b0f40': JDQ36 JDQ32B JDQ32 JDQ30 JDQ29C JDQ29B JDQ29 JDQ28 JDQ23 JDQ18 JDQ16 JDQ10 JDQ09