commit | 6a20005e9cf115b450ff344c5b13b2efaf8c4b75 | [log] [tgz] |
---|---|---|
author | Stephen Hines <srhines@google.com> | Mon Nov 14 09:13:07 2011 -0800 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Nov 14 09:13:07 2011 -0800 |
tree | fef708689b2608074bd297548477ead0bc62072b | |
parent | e61afb110a8f31aadba3f357bcf8aa8a4a818064 [diff] | |
parent | 4c622e0953afe3dca4da0aee364a811f3ccb61d9 [diff] |
Merge "Adapt to upstream changes."