| commit | 9c3eca7bcee694e6a477a7d50065f11cf1e805bb | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue May 08 13:26:28 2012 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue May 08 13:26:28 2012 -0700 |
| tree | abb36a7c1f2f13d54caad0f5a8175e47dd153730 | |
| parent | ff0d1ce4dfceb35a65440259c3f325106fc9e39b [diff] | |
| parent | 6cf3c7c50a4b9bc8425562c542f6a3d320db70c3 [diff] |
resolved conflicts for merge of 6cf3c7c5 to jb-dev-plus-aosp Change-Id: Ib22a8ae1ef63bf9b9c82ce6e22afd188ba7c2806