Merge "Import changes from an internal repo." into lmp-dev
authorJarkko Pöyry <jpoyry@google.com>
Tue, 30 Sep 2014 23:36:28 +0000 (23:36 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 30 Sep 2014 23:36:28 +0000 (23:36 +0000)
commite7c507d201b403965b5ab96b92ef8b333fdd7a14
tree6f35c9449af4601bf90bb80d4bfee9a781064dc4
parent95b0f7bcca126483f7a336a16763b00e6ab8a7d1
parent919f1341e41b3a1e31f5746b30db0f648c47b757
Merge "Import changes from an internal repo." into lmp-dev