| commit | 70c55867bc6f30301a660331bbd28948a9ded734 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Thu Oct 16 19:00:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 19:00:19 2014 +0000 |
| tree | f375fe33a4c4a0cdd825542b0e652aa0192dc082 | |
| parent | 97f11e1c34eef659c69138d39346710f037e563f [diff] | |
| parent | d991bed6f11b830616a967fde54f8d4f1e86eef0 [diff] |
am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev * commit 'd991bed6f11b830616a967fde54f8d4f1e86eef0': Add samples to sdk.atree