| commit | 05abc9093f09814d26907febbabe93e50e525183 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Wed Dec 07 13:40:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 07 13:40:58 2016 +0000 |
| tree | 270f2b3609a959a34b2a3eac4489ff4996f35868 | |
| parent | 88867bf911139781b84d6cd20c247c6b3f63ab33 [diff] | |
| parent | 785b07ed1dc7fe8074b72a717c9d657962a00c3a [diff] |
resolve merge conflicts of 48d4fe1 to nyc-mr1-dev-plus-aosp am: ee9c24d6e0 am: 269d37eac1 Change-Id: I77fbe3bdb24955b07ace6344430f693574ff95c6