commit | 5f8823c1ce67979db4f696a979171ee4694718cd | [log] [tgz] |
---|---|---|
author | Jean Chalard <jchalard@google.com> | Tue Oct 14 02:57:23 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 02:57:23 2014 +0000 |
tree | 988522b0657ea7b291788dc90dab93f8d66cc007 | |
parent | 390fe20fde55a48a4263bb328b1f7083b1a970a4 [diff] | |
parent | 9959140f15edcb32c21406e3cff80ad6856e83c9 [diff] |
am 9959140f: Merge "Fix an NPE." * commit '9959140f15edcb32c21406e3cff80ad6856e83c9': Fix an NPE.