| commit | a3404263c08c711fa5f2d73a92ec7c6f366b9338 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Feb 18 00:07:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 18 00:07:58 2015 +0000 |
| tree | 25d4fb3c1a14c189988ec0bfeaa87c28b8484139 | |
| parent | 28de8edb7d72f938f47d7fdd8ce058c5c8933b8e [diff] | |
| parent | 2f71ee24c5d982ccaa490c7a3e1390473909fbf0 [diff] |
am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev * commit '2f71ee24c5d982ccaa490c7a3e1390473909fbf0': Fix NPE