| commit | e9ae6822a80cb1f3bd13c785f1727c03d35da52e | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Apr 29 23:09:03 2013 -0700 |
| committer | Kenny Root <kroot@google.com> | Mon Apr 29 23:09:03 2013 -0700 |
| tree | b1458872d38a68b06c277276a3062bac0247509d | |
| parent | be53f1806cf9f0ec69f785a0063227e0ed795eb8 [diff] | |
| parent | 1f6e789b7ee9698ab8c528a393c28cce500ace04 [diff] |
resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176