| commit | 8ecf1c4240495888aa5cccee8c775d1b2f3f736e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Nov 03 00:25:48 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 03 00:25:48 2017 +0000 |
| tree | 13e718031775341c1cba47c4b60be2e5520a95a0 | |
| parent | 1cc0e750669747815378c75d77a7aac736f832d0 [diff] | |
| parent | a64d309ed769696b6ab48f4443ad28c845eaa443 [diff] |
Merge commit '5e1ea7c087a5fac80985b64d6ec19c16be1e06b1' from oc-mr1-dev-plus-aosp into stage-aosp-master am: 609bc28734 am: a64d309ed7 Change-Id: I1a51f00b1d8bccfbe18541e2e208ff248e9c4f05