tree 55cf6808b3b401d28bc75e9e61638ce2ef0bd1cc
parent a2ccfb386a8867f2d652d3f0b997406f830e0913
parent b490d5d3ece9b0617feacd71e4b2a85a0e1b26a8
author Deepanshu Gupta <deepanshu@google.com> 1415069978 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415069978 +0000

am b490d5d3: am 0267541c: am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 automerge: fef5001

* commit 'b490d5d3ece9b0617feacd71e4b2a85a0e1b26a8':
  Fix BridgeContext.get*ResourceValue()