| commit | b0d324aadd90abc3b91c97af418c3d27af364925 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Oct 15 00:19:06 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 15 00:19:06 2014 +0000 |
| tree | e128fd40cc8bf099b60d79a5463303f76e36df27 | |
| parent | 3e65583ef7a998a34dcc880df9c13cd33ac7720a [diff] | |
| parent | ae66eba6f3e6996e57c8aa185d9a57e4684d43e2 [diff] |
Merge "resolved conflicts for merge of 852fc3e6 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp