| commit | 5aad4e45d0e6666eec865ac7277406f97da02095 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Fri Oct 24 22:27:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 24 22:27:48 2014 +0000 |
| tree | 40f21c784cf9fc84347567c02834d840fc3165d9 | |
| parent | 96c8509e4ad462d79f5323619c77b7b7174f4ca5 [diff] | |
| parent | bd48d1e676d23f8f6ff9b57d1a92e4b3935bfecc [diff] |
am bd48d1e6: (-s ours) am 05ef7f04: DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3) * commit 'bd48d1e676d23f8f6ff9b57d1a92e4b3935bfecc': DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)