| commit | cde809e829b8a35f391f2019998aa5a856238157 | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Fri Apr 28 00:24:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 28 00:24:51 2017 +0000 |
| tree | 63ade65bf89fcb7f159a3bc9f55c47072bcd5d0d | |
| parent | f17ae528b363b955ddfd984fa25e86f7e175b700 [diff] | |
| parent | 1e68f4bb0fd846a731cf1b2b2dc76af787c7f0e5 [diff] |
Merge "Follow framework API change" into oc-dev am: 20b64e10b0 am: 1e68f4bb0f Change-Id: I9d78cf1af502761ce034809e76a5d6957b06b32f