commit | ca4362bc81e8bef2820536a2b552dea8d383b4d1 | [log] [tgz] |
---|---|---|
author | Trevor Johns <trevorjohns@google.com> | Fri Oct 24 23:28:10 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 24 23:28:10 2014 +0000 |
tree | 001d4d14821dde0a625a401063a7b8c16a69fbcb | |
parent | 41465421296619974efea860a349102b9f31ebfa [diff] | |
parent | a916086fe96df0e26c7ca364c221b3aaa12f3d69 [diff] |
am a916086f: am 5aad4e45: am bd48d1e6: (-s ours) am 05ef7f04: DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3) * commit 'a916086fe96df0e26c7ca364c221b3aaa12f3d69': DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)