commit | 48623d65e5051d4456fba1b6fef0f0ebb915fcdc | [log] [tgz] |
---|---|---|
author | Wei Jia <wjia@google.com> | Fri Sep 25 18:45:55 2015 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 25 18:45:55 2015 +0000 |
tree | 1a21f3163cea1e4d656801201cf6d08552f14667 | |
parent | 219bfd99d2bfd9694887a759e09f93b3dcad9349 [diff] | |
parent | ac9b91db9dce57e431bcc1b8e95506a8ecd3ad39 [diff] |
Merge "DO NOT MERGE - fix compile error from cherry pick due to member method becoming static." into lmp-mr1-ub-dev