| commit | c4aa31eaa4363bb854f3904b1b14962b301d5469 | [log] [tgz] |
|---|---|---|
| author | Rob Carr <racarr@google.com> | Mon Sep 12 18:42:49 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Sep 12 18:42:53 2016 +0000 |
| tree | 8d0de90ed366132e82d9a51ddb79daab67fd77ef | |
| parent | 47e8e16e5f75f811aeb89748576dfaef598c25af [diff] | |
| parent | 24ad15ecee1c4e453b74bc432534a0a3649ca48d [diff] |
Merge "resolve merge conflicts of 6540c23 to master"