| commit | fc9c11995b07bbeea6712ce2e722646dabd238e4 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Tue Nov 25 18:48:31 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 25 18:48:31 2014 +0000 |
| tree | fd692cd5913a31ac73287b384066abd4d9658b47 | |
| parent | 33b16225e22d748ab3a9868b10eaba325636d928 [diff] | |
| parent | dad302f91a4dadda84d4329318eb83103ca6b7b5 [diff] |
Merge "resolved conflicts for merge of cb6b3cf1 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp