| commit | 7764025585729ae04f58ac6375628c95c4cc2688 | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Fri Jan 08 21:01:06 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 08 21:01:06 2016 +0000 |
| tree | d43c20efa3dd8b8d28f7a3edb997fc73407a6407 | |
| parent | 433df5c865dde8402c6a199de4eb898dfa3aff08 [diff] | |
| parent | 3b16e7b1a54d17926efb6fd0c3456732e016a02c [diff] |
Merge "resolve merge conflicts of 0271416563 to master."