| commit | 367400491a22cefd4e366e2278caf63d574820b0 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Oct 17 10:50:14 2012 -0700 |
| committer | Kenny Root <kroot@google.com> | Wed Oct 17 10:50:14 2012 -0700 |
| tree | 683fd4f160028134b2d92b93df6da5485bb98954 | |
| parent | ae232842c86f108da5a73c047eff5a09e9c9c222 [diff] | |
| parent | 40f2f751ac7cebc455b44da23b9589cca5ae2e25 [diff] |
resolved conflicts for merge of 40f2f751 to jb-mr1-dev-plus-aosp Change-Id: I6075e2bf98b0f8310c93fac649c34cbbbd89707f