| commit | 4a673770cb099a2f710d96e52a0c96777e9c4f6a | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Mon Jul 11 16:16:10 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 11 16:16:10 2016 +0000 |
| tree | d8cb6f43f1d81b42f6093c289784fa8411cfad69 | |
| parent | dd740c6817a20dd0be59eeec4c54b16e99c135c8 [diff] | |
| parent | 538ed261ebdc1234b09c3a5289476764d3ab5f40 [diff] |
resolve merge conflicts of 4058a71 to stage-aosp-master am: 538ed261eb Change-Id: I2ef81a2279ba62bc00c2a40d703666411877058f