| commit | 538ed261ebdc1234b09c3a5289476764d3ab5f40 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Mon Jul 11 09:08:24 2016 -0700 |
| committer | Tao Bao <tbao@google.com> | Mon Jul 11 09:08:24 2016 -0700 |
| tree | 0e5a30dc5e7f05660a56fac7b86a8938a0465aa6 | |
| parent | c4449f819c7ab959e9f0e38affdf5a56e19cb2ad [diff] | |
| parent | 4058a717470f11427abc38e4018218f76e3e3119 [diff] |
resolve merge conflicts of 4058a71 to stage-aosp-master Change-Id: I0816bfc5d8adb20e175617d97651f1474ce4e916