tree 6bd90b0e7b4ea7b40854999e3e459a12717d7b14
parent 26f7720ed0d6a0894772d82b7ebed03ac686c6f3
parent dd5bdc6a781662e7031b11ea5158b854e32b0e0d
author Jason Monk <jmonk@google.com> 1437425235 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1437425253 +0000

Merge "Fix hotspot brokenness" into mnc-dev