| commit | 516690d1d510922b09c328f0495ab4cc8ec2a8aa | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Mon Nov 14 18:16:51 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 14 18:16:51 2016 +0000 |
| tree | 5d0d06dfd8fda84c3d6db4be1bdd51e9874418e5 | |
| parent | e3a60f20650f990119f837f7a1ca98f954d82391 [diff] | |
| parent | 20dae868a8a78b478638ac56307b8f0584ef4d88 [diff] |
resolve merge conflicts of 7b82162 to stage-aosp-master Test: build Change-Id: I1c114d0bd88f0ee91c384a5983146b2cd08ae08f am: 20dae868a8 Change-Id: I4f55c7a72bd5598e196ca0524c57a14fc5ae7256