| commit | 36e2384228f5b0c687dbd9feec0b7d7c290f6a3f | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Jan 22 19:14:52 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 22 19:14:52 2016 +0000 |
| tree | 5a8f631e24e60faaf5480daf10e5f422b0eabc5e | |
| parent | 6b12575440fabdbc8aa47879814950f7bce68677 [diff] | |
| parent | 24b1c64c5b6c91f72c3f2fa0f30d881c65efb124 [diff] |
Merge "resolve merge conflicts of bb3d77ba95 to master."