commit | c16340c646b7c89f6ae40fcbf9773d0ecfa5685d | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Tue Jan 09 00:51:41 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jan 09 00:51:41 2018 +0000 |
tree | 3791be8a424fec5257545f57fcaf5b8d751135f2 | |
parent | 9c7799345c2132e3cce88ce69cfe96c562df6c98 [diff] | |
parent | b162da3a47071e42aaf7ab893bde838bef6d075f [diff] |
Merge changes from topic "resgidz" am: a7004e5fed am: b162da3a47 Change-Id: Iebe526ef318e7602ac55fb9822261554002df255