tree c6b0cd23a0c0c9c608b0b736e07788547eedce0e
parent de8546f31baaaddc13216eccdf2efd686bf85783
parent cedbcb634f98133b4ce77750d33f621d29acc6ea
author Tao Bao <tbao@google.com> 1488854617 +0000
committer android-build-merger <android-build-merger@google.com> 1488854617 +0000

Merge "releasetools: Fix two minor issues with _LoadOemDicts()." am: 0c9e8d87c4
am: cedbcb634f

Change-Id: Id80b3161d864392b249eb3d01ebbd28be16a8e61