| commit | 7313468593eff0431ce671cf8044a9ac64b11d4f | [log] [tgz] |
|---|---|---|
| author | Sander Alewijnse <salewijnse@google.com> | Thu Sep 17 23:13:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 23:13:15 2015 +0000 |
| tree | 54c619e8feb08bf95189d1ffc1c17481dbee9a62 | |
| parent | 957e7237acbd219cfaab3b088b4c5376c63f1878 [diff] | |
| parent | 61a4fce31fb0a147e89ea7dadd9676d29e314ac9 [diff] |
am 61a4fce3: am 84283992: am 6e499f6f: am fb758de5: Merge "Add CTS test to test Setup wizard Nfc config." into lmp-sprout-dev * commit '61a4fce31fb0a147e89ea7dadd9676d29e314ac9':