| commit | fa2bc91df52f6a4faa0bccc9eb04e936a1bdbd0c | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 27 05:22:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:22:28 2015 +0000 |
| tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
| parent | 9f1fb17df293ac80d32eaff4a53c73f7154c8952 [diff] | |
| parent | dc664276f12cf66076775f5d222ec93ac5efb8fc [diff] |
am dc664276: (-s ours) am ad1ce71a: am 96a09849: am 50b600d6: am ab33de61: am 78df80c2: am 65842db0: Merge commit \'b46eb8d9\' into HEAD * commit 'dc664276f12cf66076775f5d222ec93ac5efb8fc':