| commit | 039628f2f8280998ff1fa39bccfd9a1bac9762e3 | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Wed Oct 26 19:28:45 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 26 19:28:45 2016 +0000 |
| tree | 71a9901acefc0a13b1d33ed874884dd2310012e9 | |
| parent | f5a0f00a815aac70fc8c3575e18d7f4690eb76e4 [diff] | |
| parent | f129e47957dcf854a7afbe13a4e8ce36b6386f60 [diff] |
resolve merge conflicts of 930462e to stage-aosp-master am: 87fc790e27 am: f129e47957 Change-Id: I6c786ff53e8188038e7cf4c9d62af4195f878cb6