| commit | 605b869a362e19cdbf5e689dc13144e95fb3676f | [log] [tgz] |
|---|---|---|
| author | Matthew Williams <mjwilliams@google.com> | Thu Dec 10 21:28:02 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 10 21:28:02 2015 +0000 |
| tree | dea9305765ee66cacf032eab6fe36e58d4a016b1 | |
| parent | 25c2ebc10766effb86f55813dc79c0d1cbe79858 [diff] | |
| parent | a474554fe62ea27eb49550d3da4e918c84740926 [diff] |
Merge "Merge commit '1db19fc70e24bc5e3c6d77f2b9a5374c372e46cd' into manual_merge_1db19fc70e"