commit | bac0d879267c1980e026e1f91fe38af04f2b8712 | [log] [tgz] |
---|---|---|
author | Todd Kjos <tkjos@google.com> | Fri Dec 16 21:14:16 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 16 21:14:16 2016 +0000 |
tree | 6177e483979938cf102599998801854e534e8aff | |
parent | aaa695809a3dbf28c6e26a1c6375ac27dc1dcbad [diff] | |
parent | 85a19e86d01b3b6ec7ae18581b7743fe6376f940 [diff] |
Merge changes I627e47c6,Ic85892b4 into nyc-mr1-dev-plus-aosp am: 85a19e86d0 Change-Id: I240a2ae5d97e275d3660a7a2d5e9f2e5e222e813