| commit | 59c38f268d7dfedad068d4e2c2d4bd9bdb818b93 | [log] [tgz] |
|---|---|---|
| author | Dimitry Ivanov <dimitry@google.com> | Mon Apr 11 20:29:02 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 11 20:29:02 2016 +0000 |
| tree | 9601e8f96ee71c47c251ea8346e9872c397d3014 | |
| parent | ada850d0c6a7c36e425f7b9e528381ce7b91e583 [diff] | |
| parent | 2db895cba1ba45da375e7940d3e7637fcbedf83a [diff] |
resolve merge conflicts of 663c998 to nyc-dev-plus-aosp am: 03890da * commit '03890daa4eef70a192c91c2929a7e4dc5549bd63': Allow vendors to extend the list of public libs Change-Id: Ic6754bffadf8c5ce6f2f925d155e4f3fdd9f5bd7