| commit | ffed1ede87553f8d6a104a5e92945fd5fa4557f9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:20:38 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:20:38 2012 -0700 |
| tree | 6a45200d53f55e3dfbb51b12c30d0429ab31504b | |
| parent | 0a78ee3aeeb33711d44993be61e3d48f78e2d640 [diff] | |
| parent | 29f419a9e8c5676e2a1a1a7da41e59eca3827f75 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ib983813de597b2eabfc0e4657a5945c8791a5c88