commit | fb3051b15e15b0f57196e0f2bc6ba8570f7ffe5e | [log] [tgz] |
---|---|---|
author | Mathias Agopian <mathias@google.com> | Sat Oct 16 08:52:30 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 16 08:52:30 2010 -0700 |
tree | 34c53f1b0701a01459e015dbc3e8915389d009a2 | |
parent | 1cc53746aa8f548349385af7134af1135cfd1d5e [diff] | |
parent | af384f8e3bf56f9bf4f10e5977093cbc41557464 [diff] |
am 7e9a54d4: am d4e03f37: addresses parts of 3096779 and 3097475 Merge commit '7e9a54d460030a871a4f05e61e943c6a694e9ef8' * commit '7e9a54d460030a871a4f05e61e943c6a694e9ef8': addresses parts of 3096779 and 3097475