| commit | bf8d4d7b72d11a600b169d85c7a895f5eee5a586 | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Wed Jul 19 00:34:05 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 19 00:34:05 2017 +0000 |
| tree | a4a046de9a9d1e4886e481cfb7a016a60a5a2d6e | |
| parent | 974d1d3a4af6f3c184cd9b16f6ae22421cfede99 [diff] | |
| parent | 26ce593c1ee8d82655859b84d6691c7260495184 [diff] |
resolve merge conflicts of 6ecc54a7 to stage-aosp-master am: 227fe277bf am: c278e0ae17 -s ours am: 26ce593c1e -s ours Change-Id: I75e44f407a5bce113573c6e2f8e5bbc6762d762f