| commit | 4f2b14ca1a556597bac51ea24d22ece647a9850c | [log] [tgz] |
|---|---|---|
| author | Todd Kjos <tkjos@google.com> | Wed Nov 18 19:18:07 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 18 19:18:07 2015 +0000 |
| tree | 600df82bf78db88751059db0f7685fe40f908db7 | |
| parent | 157a475d73189f7471b3b3e9bfeae9c3a1fb8db3 [diff] | |
| parent | e4c31f3387b6b3a1039400f3790846516020a550 [diff] |
resolve merge conflicts of ed60788968 to mnc-dr2-dev-plus-aosp. am: 88b5892d74 * commit '88b5892d74978df60585ce59dd283d188fecdafa':