commit | b1a9f8cf4b15a861ab998a4c5f0c69068f22c62a | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Mon Jun 24 17:19:43 2013 -0700 |
committer | Colin Cross <ccross@android.com> | Mon Jun 24 17:19:43 2013 -0700 |
tree | 747a6b8891d0c685d805a9c254760a46800adccb | |
parent | 39021a48a0e0687c654423acd5a4c99a1d79440d [diff] | |
parent | b6c602859496e212db78435e2b05ec9418189d6c [diff] |
resolved conflicts for merge of b6c60285 to stage-aosp-master Change-Id: I5afba55b668065499fa28369cf217d4f5eafab4a