commit | ae3c02f66d2657b109895442df985a9aad7ba02d | [log] [tgz] |
---|---|---|
author | Chris Flatt <cflatt@google.com> | Mon Feb 01 13:06:04 2016 -0800 |
committer | Chris Flatt <cflatt@google.com> | Mon Feb 01 21:09:22 2016 +0000 |
tree | c29490cc2556f7e495ebeec00ed7ed43e292e406 | |
parent | a8fbffb075861f3984e864baa1b63f7e530228be [diff] |
DO NOT MERGE ANYWHERE Manually Cherry Pick AOSP change to resolve conflicts. https://android-review.googlesource.com/#/c/151358/ Change-Id: I190eeb8f17d29eb451e741ce7e11f61c95c66f1e