| commit | 74e86ea582757e7c954a32c8851904c4c366767a | [log] [tgz] |
|---|---|---|
| author | Sami Tolvanen <samitolvanen@google.com> | Tue Jun 14 23:27:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 14 23:27:47 2016 +0000 |
| tree | d5659e6f0c57900f1dd1cc74b5441e6d1f9fab3f | |
| parent | 3fecf887bc0494a00f76e0e4db107cf96c678ea3 [diff] | |
| parent | d8aee77a6c48b00ecbc4c1f9113252d742ba244a [diff] |
resolve merge conflicts of a742d10 to nyc-dev-plus-aosp am: 589994504a Change-Id: Id907340d77f2d18facb0b1576b7546667bce4f6e