tree 2079da6d074fb490c1b3414ca26799eb229e7a86
parent a7d2992ba385e6b9bfae32982b8b9a3f345281f2
parent b00dbd1b11d78f6375385fd86eef1f006a542437
author Tao Bao <tbao@google.com> 1475258371 +0000
committer android-build-merger <android-build-merger@google.com> 1475258371 +0000

Merge "releasetools: Fix the reference to OPTIONS.info_dict." am: 0a5b59e78b am: 8b6d59e110
am: b00dbd1b11

Change-Id: Ib31adf3e30f4b9077e14c577ffdc5791e89b746b