OSDN Git Service

Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev
authorUriel Rodriguez <urodriguez@google.com>
Thu, 31 May 2012 15:44:15 +0000 (08:44 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 31 May 2012 15:44:15 +0000 (08:44 -0700)

Trivial merge