Merge "Import several fixes from main repo:" into lmp-dev
authorPyry Haulos <phaulos@google.com>
Thu, 25 Sep 2014 02:21:44 +0000 (02:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Sep 2014 02:21:45 +0000 (02:21 +0000)
commit8812ed800144e333dc19d49f28d717b74c8f29db
treef05dcc5e39594d618663a37ae32a2c81c466a5d2
parente688e4206c9eafc896e7dcd78c0951549a97ad7a
parent2e751e3e77060f699c560104e82379d3ce54f67a
Merge "Import several fixes from main repo:" into lmp-dev