tree eac690bc45305ef139146a02c23ac62c58e8b624
parent 4344e6fee310ae8e9d2374c6f140a877fd4aad44
parent 0eae54085d05f75525a292787f5822c8bb94d0ff
author Wei Jia <wjia@google.com> 1443100273 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1443100273 +0000

Merge "fix compile error from cherry pick." into lmp-dev