| commit | cd74108cdac228e946ca8b6ea2ff11ab62941a6d | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Oct 16 17:44:21 2012 -0700 |
| committer | Kenny Root <kroot@google.com> | Tue Oct 16 17:44:21 2012 -0700 |
| tree | c657c4603c41f1cac92c540bd5e1eb07b4b0c9ad | |
| parent | d0d4d44d344779e59ee196637bbc745d68d70677 [diff] | |
| parent | 78afed1c15989d4aa7e66094afa81cd3a6d22674 [diff] |
resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp Change-Id: I861e3a6aa07c448909b2ae54618bba178bd6e457