tree 40f21c784cf9fc84347567c02834d840fc3165d9
parent 5aad4e45d0e6666eec865ac7277406f97da02095
parent a01188985e5b2317e22e73a3ae04b0f624ffa207
author Takeshi Hagikura <thagikura@google.com> 1414454740 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1414454742 +0000

Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev