| commit | 1dfe482021c533c23726514c81a24c752d8f6b1a | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Fri Oct 14 23:45:15 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 14 23:45:15 2016 +0000 |
| tree | 2eb12fdfc95a0f3bd4a8efec0102364fb3b4cbf5 | |
| parent | a1b9c560b75b30ad519392f89f8cf07b1d7251dd [diff] | |
| parent | 36415acf6a840f80d8d52b957b117d48ddb8c9fe [diff] |
resolve merge conflicts of 08d0ae9 to stage-aosp-master am: ddf293aa0c am: 36415acf6a Change-Id: I8b71b0d55971f6d94ef6af59b6efa1300fe17df4