| commit | 36415acf6a840f80d8d52b957b117d48ddb8c9fe | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Fri Oct 14 23:40:53 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 14 23:40:53 2016 +0000 |
| tree | e8abe9c634ed821359ad3bf70a80170f9c7b3e52 | |
| parent | 1709d22b4ec007da172e2d49ced99847c6f00225 [diff] | |
| parent | ddf293aa0cfe6ba9562ad12bc8555e6f389db53f [diff] |
resolve merge conflicts of 08d0ae9 to stage-aosp-master am: ddf293aa0c Change-Id: Ia4fb968c0b45b584a69f28401507826f837a978d