| commit | f9e940436e1c4498d867bd583a680bd0f9bba244 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Sep 03 04:17:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 03 04:17:23 2015 +0000 |
| tree | 8363ede82e479f1a9769f7cf380f9fa3aa7d9a6a | |
| parent | 8aa13ac42b83f4382223bd5756cd336ac49f2400 [diff] | |
| parent | bead46972a7d6d1c4a37923a12f59fad06e76322 [diff] |
am de2c8a24: resolved conflicts for merge of e9436908 to mnc-dr-dev-plus-aosp * commit 'de2c8a24cedd7f75ab43f634535c143f1c5be479': Backport missing null check in "adb get-state".