| commit | 4ff7f9f62ae5d283fb62ee87c615a801642cba8f | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Thu Aug 04 22:04:05 2016 -0700 |
| committer | Josh Gao <jmgao@google.com> | Thu Aug 04 22:04:05 2016 -0700 |
| tree | 3b06c34eebb1741642dda0f3eb6e8b0caee6c520 | |
| parent | d7c6ac024c02da60ae3c53cd8af3fe4fe57982b5 [diff] | |
| parent | e012de57182f835b299dc0ea74b5f362609d5b63 [diff] |
resolve merge conflicts of e012de5 to stage-aosp-master Change-Id: I3d9f8b4421fa6122261dbd821561a2236f810a47