commit | 04748530868d329b1e7902427c8285614636712f | [log] [tgz] |
---|---|---|
author | Uriel Rodriguez <urodriguez@google.com> | Thu May 31 08:53:07 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 31 08:53:07 2012 -0700 |
tree | 262d840ede3bb7c28ed2c9bb4fdd184505e4a0f2 | |
parent | b6d8112321ca354dd53885fbcd88d45e5b05d121 [diff] | |
parent | 6e43ee6796795840819843e2693f6f3622638208 [diff] |
am 6e43ee67: (-s ours) am fa716c7b: Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev * commit '6e43ee6796795840819843e2693f6f3622638208': BUG 5457035 : Anti-spoofing : DO NOT MERGE