| commit | 74d09c3dea0adc6d3a0680ed5f93c7468f994da5 | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Thu Nov 24 02:02:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 24 02:02:58 2016 +0000 |
| tree | f4339400ae765f628c1d32abd4ffc9943f11591f | |
| parent | aff2b79dffbc366746bd1f8db1125b8a6afb6c22 [diff] | |
| parent | 044e71c2d09dcdc24ae9013857aede85f59b5808 [diff] |
resolve merge conflicts of 7520e49 to nyc-dev-plus-aosp am: 3e906a925c am: 724e51e88d am: 044e71c2d0 Change-Id: I7b4ed8280010e11cc4d3153bde326e917f1a30cb