| commit | ed935c32f478229220a90442da0af3c3d3fc6230 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Thu Aug 11 16:48:46 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Thu Aug 11 16:48:46 2016 -0700 |
| tree | afe24a352b95a8e8e1384e1e9d0b91a26639b7c4 | |
| parent | 5aa4ba3776e3017a686acc1e6f7acfd04f272d61 [diff] | |
| parent | 76ce8e52422bc6121fb974ef6aab040bb5d9da51 [diff] |
resolve merge conflicts of 76ce8e5 to stage-aosp-master Change-Id: I4b4ca9906373a95776d2da8ba2fa39a4a78e2a30