| commit | bbbb514bc9777c5f9ca2a93087e5d3505884e265 | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Mon Aug 22 22:19:06 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 22 22:19:06 2016 +0000 |
| tree | 18d91556d3f25d4942041108a4d6f51fa149b296 | |
| parent | 96052ea9053c9e51768ad03246f4f845d4a469fd [diff] | |
| parent | 76c4b2a7b66d6220265ca08a70b0f9baa543a7f0 [diff] |
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours Change-Id: Icdcd0929eb7bd32665e91fe2598af46db3ff01bd