tree 0334dc7e4dda3c2037d785aab469dad9403e48cc
parent 2ffbfba5ad2f5cf0290eb04cae0db4f636dcb0da
author Scott Main <smain@google.com> 1375211198 -0700
committer Scott Main <smain@google.com> 1375211716 -0700

fix a few bugs.
xxhpi bug: 10071401
bitmap code, aosp: 58020
intent code, aosp: 57698

Change-Id: Ice59c52d095d1e173918cae692368bf0f6636a14