| commit | f901ea773db9b4e8f2d226661a2380573c14425a | [log] [tgz] |
|---|---|---|
| author | Jae Shin <jaeshin@google.com> | Wed Sep 20 07:03:57 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 20 07:03:57 2017 +0000 |
| tree | 2301decead629b6b8d7963c24109db024eeb8153 | |
| parent | c42ab021fdf0f904702c76c2a002ede6072bd481 [diff] | |
| parent | cc7762c629501a02d06d9294c4fa4f1306cccd79 [diff] |
resolve merge conflicts of 8007bdd7d to stage-aosp-master am: 5c34e4895c am: cc7762c629 Change-Id: Ic512898c9304f8b50f791d77580fcf2deeac3193