| commit | d48f14fc02114e90c8212cf6302aae4793491c42 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 07 10:19:58 2012 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 07 10:19:58 2012 -0800 |
| tree | 67ac459afa6ab0e17147e5f3edca46c675888c71 | |
| parent | 6af3665bbfeade59948947f7f503345d04cf0a94 [diff] | |
| parent | b211e832fcb3dd76ee63f1dc936d1e5ba7762ac2 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ic0cad6c664001b47eee72ed7bb3034626bfeae76