| commit | b33190fc560a0793749dcb895f7ccc8f285020c8 | [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 | 5b3c286d860334fdcbe3313e9d5ac2a83a0acc36 [diff] | |
| parent | dc814fdbb4ea14842510603078db7b085e17241f [diff] |
resolve merge conflicts of e012de5 to stage-aosp-master Change-Id: I3d9f8b4421fa6122261dbd821561a2236f810a47