commit | d1123c29614eb9e0df7485f9e0775470db2f0384 | [log] [tgz] |
---|---|---|
author | Stephen Hines <srhines@google.com> | Tue Nov 15 04:04:18 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 15 04:04:18 2011 -0800 |
tree | af827d21764c2dcde4b8820b4d3944c648a45860 | |
parent | 8246320ef1d7aa1c00c8a897fe685cb037f99d53 [diff] | |
parent | 6a20005e9cf115b450ff344c5b13b2efaf8c4b75 [diff] |
am 6a20005e: Merge "Adapt to upstream changes." * commit '6a20005e9cf115b450ff344c5b13b2efaf8c4b75': Adapt to upstream changes.