commit | cfcf110f901dcea758b8a1510c237e34cde5ee08 | [log] [tgz] |
---|---|---|
author | Todd Kjos <tkjos@google.com> | Fri Dec 16 21:31:38 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 16 21:31:38 2016 +0000 |
tree | 71e24906721f452b0f4fec4cfa56df153dad5117 | |
parent | 2084083fb3f0c1f0d7936431f70ce562d2ad2885 [diff] | |
parent | bac0d879267c1980e026e1f91fe38af04f2b8712 [diff] |
Merge changes I627e47c6,Ic85892b4 into nyc-mr1-dev-plus-aosp am: 85a19e86d0 am: bac0d87926 Change-Id: I6b2e0cf609bed4e046b37a00d52665a8aece12a6