| commit | d170e491f53ac61debd687c6145783aa920320fd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:20:52 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:20:52 2012 -0700 |
| tree | 437d1facc98d80542c81b038c97900acc35d66a0 | |
| parent | 8ffcbe9ddf894c34c0f72b4aebc376348568be94 [diff] | |
| parent | 61bb71c83c1b7c60fb8ea16ef9db3a5bdb95b42e [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ifb2db1bc3d3d8ec81ce253e2ecedfc5f2a324cee