| commit | 5ade8ae26cf711b01e093138fd976d497c04884f | [log] [tgz] |
|---|---|---|
| author | Tim Kryger <tkryger@google.com> | Fri Dec 16 00:54:41 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Dec 16 00:54:41 2016 +0000 |
| tree | 513de317e9d85829106a688b28539326d64198b2 | |
| parent | a3e2f0b08230f03d50feae7861cb5ae9a75b5124 [diff] | |
| parent | 910c83b915cc1c9f1dc28443f2ccf38514ffef9b [diff] |
Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am: 910c83b915 Change-Id: I3ddcf068bea9ae723e6609e4c599fb34b0e7090b