| commit | 7bbbc167e520806a0c4645094371b6996c911b82 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Fri Sep 25 21:13:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 25 21:13:46 2015 +0000 |
| tree | 0d4ee497faebb27c23ccdcd9aa45bc105fe52d34 | |
| parent | 7795d8e93899ee176c3642e35a8c20ed4b90789a [diff] | |
| parent | eaa5ed731470ef90a837329e1395b79dcc6887ca [diff] |
am eaa5ed73: am 48623d65: (-s ours) Merge "DO NOT MERGE - fix compile error from cherry pick due to member method becoming static." into lmp-mr1-ub-dev * commit 'eaa5ed731470ef90a837329e1395b79dcc6887ca': DO NOT MERGE - fix compile error from cherry pick due to member method becoming static.