| commit | cc7762c629501a02d06d9294c4fa4f1306cccd79 | [log] [tgz] |
|---|---|---|
| author | Jae Shin <jaeshin@google.com> | Wed Sep 20 07:01:56 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 20 07:01:56 2017 +0000 |
| tree | 2b56fb687417f9751f697a3d72c6b90aa62d9f9f | |
| parent | 66707835ad63ae7eabea837d7996f9ab33203ab0 [diff] | |
| parent | 5c34e4895c4f66a19901bd2d9d1eb6b9bcd623bd [diff] |
resolve merge conflicts of 8007bdd7d to stage-aosp-master am: 5c34e4895c Change-Id: Ic2cb90ffcc2c77a9a97098c6f15e3d96a9d9c12a