tree 08495dde4a95df7772fac6763efa965262fbe368
parent f405c58c091b3ac9892e2811550d586aa5f65492
parent 92392b21f2003e76a309d81b12ace2839d4783f9
author Jean Chalard <jchalard@google.com> 1387530895 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1387530896 +0000

Merge "Fix an NPE"