Merge "Import fixes from an internal repo." into lmp-dev
authorJarkko Pöyry <jpoyry@google.com>
Mon, 29 Sep 2014 15:36:06 +0000 (15:36 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 29 Sep 2014 15:36:07 +0000 (15:36 +0000)
commit7b14887ff2086b1eda33904abd7b969f2c28dd4b
tree812287c3f457d9e9545e5ce1166d57b78d6e53d9
parent24f9049882d302a83a4788f829863f123f2aeae1
parent271c2654cc44f23492888c7ef40c36c2fd810c77
Merge "Import fixes from an internal repo." into lmp-dev