| commit | e629ced86ac585ea78eaac00140d05c5a06b80d2 | [log] [tgz] |
|---|---|---|
| author | Jorge Lucangeli Obes <jorgelo@google.com> | Thu Jul 21 23:14:46 2016 -0400 |
| committer | Jorge Lucangeli Obes <jorgelo@google.com> | Thu Jul 21 23:14:46 2016 -0400 |
| tree | 0c2313167344569224b40101a355a2b0e2f59ebd | |
| parent | 5dbf5141444304f4772874ec2407b90d1291a4b2 [diff] | |
| parent | c6e22ba1a135e336fce067ef3d5372dcaeb9499f [diff] |
resolve merge conflicts of c6e22ba to stage-aosp-master Change-Id: I65550ff841d27f985a3ab8618ecdf4a3500fb0be