| commit | c563d2f61623b9d4560dbe29029014ec753cab86 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Mon Nov 14 18:24:12 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 14 18:24:12 2016 +0000 |
| tree | 4d571295f0848f26fc91d9f710ad9952dddc660e | |
| parent | f1c298fd0719d919b8b2dbf56cbdab96dd06222b [diff] | |
| parent | 516690d1d510922b09c328f0495ab4cc8ec2a8aa [diff] |
resolve merge conflicts of 7b82162 to stage-aosp-master Test: build Change-Id: I1c114d0bd88f0ee91c384a5983146b2cd08ae08f am: 20dae868a8 am: 516690d1d5 Change-Id: I78f01e0d73e0a3a06abea37b940aebbecb779bce