| commit | f3456803fed4ff529dea53fd9bc338887886acf9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 13:26:48 2012 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 13:26:48 2012 -0800 |
| tree | 760dfd1f2b4cfc60ddd12f8725f71e22dc243c14 | |
| parent | 717797db3e59ec34190e1230ebdeafecd14f4948 [diff] | |
| parent | f0de33bef165ee50475bad27c5f0849c5eea58c4 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I6206907ad603bf70ca2c9ca3b9afc136fe2a1695