| commit | e497d15d6faf3e4681389d2a5edbd398d9c68252 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Dec 11 20:08:32 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 11 20:08:33 2014 +0000 |
| tree | 7cefbf33090bcc3ff6a0937c65fc4925f92b1260 | |
| parent | 9de0107e6fc635fb615161e76536bb907b2da563 [diff] | |
| parent | 57dafdccc2d89228414af1ca7d6afb006e13a3f7 [diff] |
Merge "Merge commit '4e9b7b53' into merge2" into lmp-mr1-dev