| commit | 85074d06aa9d2785e077db22974c61cbf075728b | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Fri Aug 22 18:44:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 22 18:44:54 2014 +0000 |
| tree | 67a5a280c8216a536d3b06e6a561bad2e2652523 | |
| parent | 76f5fe77d2e53e245ee9d811152cf2333604db63 [diff] | |
| parent | 18ec7c4f8a8d1780fa80f0ab21e484576c775fe4 [diff] |
am 18ec7c4f: resolved conflicts for merge of 566a4694 to klp-modular-dev * commit '18ec7c4f8a8d1780fa80f0ab21e484576c775fe4': Update sdk_repo samples 19 rev from 5 to 6. DO NOT MERGE.