commit | 37651a8baa1405a8b53b41f8c75d75fa3d760956 | [log] [tgz] |
---|---|---|
author | Jorim Jaggi <jjaggi@google.com> | Thu Oct 30 14:30:58 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 30 14:30:58 2014 +0000 |
tree | e6c1d5a2260d1c4b792cdbdaea16e61373232785 | |
parent | 1a9864db0af701074d9060f8eef8189e108485be [diff] | |
parent | 2905cafcb898bccb1f52e77f3c2f7eb5fc9fe01f [diff] |
am 2905cafc: Merge "Follow up to I495ce480c25de24b6433adebdfe923b637d98f66" into lmp-mr1-dev * commit '2905cafcb898bccb1f52e77f3c2f7eb5fc9fe01f': Follow up to I495ce480c25de24b6433adebdfe923b637d98f66