tree 0fc13fd92643f45f47367ee042360cbfee28b309
parent 63d1d846a7d6b68368a58d5771dff74301f19608
parent 46637f4b11090250fb16ce27e50b012351c750e6
author Igor Murashkin <iam@google.com> 1426889331 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426889331 +0000

am 46637f4b: am d5205c26: Merge "portability: Fix incorrect comparison between int and Integer" into lmp-dev

* commit '46637f4b11090250fb16ce27e50b012351c750e6':