| commit | 21f67731bb5c0e399a78aa0330ce4738e70e106f | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Sun Jul 24 23:14:18 2016 -0700 |
| committer | Jesse Hall <jessehall@google.com> | Sun Jul 24 23:14:18 2016 -0700 |
| tree | 59ecbe87f34813dad1c90f0a0389702bb10aa385 | |
| parent | fe11e10bb619a3ffef51376bb0d61f6b21f4a2dd [diff] | |
| parent | 75b79d3f73acd9b86307523c9f12762fab29a253 [diff] |
resolve merge conflicts of 75b79d3 to stage-aosp-master Change-Id: Ia7201fb25389688231cbcfb1ac24aeef7dec79d8