| commit | 6a5027094470a7db4b714151622df6818172ec2f | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Mon Aug 22 22:28:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 22 22:28:24 2016 +0000 |
| tree | 95cdfa1cbe3a6db0cca8b2e34c806c2e34c78967 | |
| parent | f368bdee06b0526aa53f14dcdfe8e875269cb2e4 [diff] | |
| parent | bbbb514bc9777c5f9ca2a93087e5d3505884e265 [diff] |
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 Change-Id: I47bfb18ce300e52a092da534b8aac720f0b8aa3f