commit | ee269e3c4af7388e22d65b6c5e6e5c33454f81cd | [log] [tgz] |
---|---|---|
author | Justin Ho <justinho@google.com> | Thu Oct 21 13:47:34 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 21 13:47:34 2010 -0700 |
tree | a651c032f6b71dc0e2ded3620459a6a61f014dfb | |
parent | 59ab1d0bada1f57848bb1afd886cb4f162463a39 [diff] | |
parent | 9466ec6b8c829b0edc2012d81b7e5d92d71ab08f [diff] |
am 9466ec6b: (-s ours) am 85cc962d: DO NOT MERGE - Updated dialer assets (2) Merge commit '9466ec6b8c829b0edc2012d81b7e5d92d71ab08f' * commit '9466ec6b8c829b0edc2012d81b7e5d92d71ab08f': DO NOT MERGE - Updated dialer assets (2)