| commit | cdf70ba0a3c7d4fcfea0adbae9d6dd3f38678747 | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Wed Aug 24 20:38:40 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 24 20:38:40 2016 +0000 |
| tree | f60633b7ed42f63f0bbc3e8de357adb43b0882ad | |
| parent | dfc2d0a4bcbae8880d684805de3715cc55057819 [diff] | |
| parent | a0994c6d58bcdc1bcc7d8e60353f5b675c30bcee [diff] |
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 Change-Id: I50cb41c74c4d049390155fc0981f6609673febd0