| commit | 095652d3cb5e9c7837291f8b8734599962ae4d55 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed May 07 22:06:23 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 07 22:06:24 2014 +0000 |
| tree | 9c803d0f95ec1ead997258cb156c7e5de73dacab | |
| parent | 945c27836bc372bdf1b77b0edf788eb72e4001d3 [diff] | |
| parent | 6422abef786632e53337c6c298ffa64f7ddf4d90 [diff] |
Merge "resolved conflicts for merge of 3bbef521 to master"