| commit | 84b61fb4b0142fb54d9c288f0e90c64028871d5f | [log] [tgz] |
|---|---|---|
| author | Jakub Pawlowski <jpawlowski@google.com> | Thu Aug 11 23:05:49 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 11 23:05:49 2016 +0000 |
| tree | 31def16e0c598c57a3ec8a9596c84ee6cb4e6d5b | |
| parent | a33407d2f8a13e80a76b1493d06e443bb9c5f015 [diff] | |
| parent | 5aa4ba3776e3017a686acc1e6f7acfd04f272d61 [diff] |
resolve merge conflicts of 5671277 to stage-aosp-master am: 5aa4ba3776 Change-Id: Id0926a640dd15d33d6df9582009d587d7bed1872