| commit | fa870606e70d53991eac9c401bde4506d7503092 | [log] [tgz] |
|---|---|---|
| author | Romain Guy <romainguy@google.com> | Tue Sep 27 16:44:28 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 27 16:44:28 2011 -0700 |
| tree | 0a69cd7b2adf3d3bf670e877beb366f7d0e390b4 | |
| parent | 54b6a9bdb9f8213899c93dc131d9dc39984e90a0 [diff] | |
| parent | a3cc6e758cb30774d7cc54cddcd9599d279e4492 [diff] |
am 0e8fb15d: (-s ours) CherryPick 043a6b from master: do not merge. * commit '0e8fb15da2bd0912aa74ba6709dfe3d5b7c84fde': CherryPick 043a6b from master: do not merge.