tree bfe43397ad81b84d593b98d9d86051098e4d5b32
parent a133c6c962b09b7c3bd1d1a64a3440311da020ed
parent 2f2ac941d341987f0a0661b575c74db5acb64dfb
author Irfan Sheriff <isheriff@google.com> 1336606721 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336606721 -0700

Merge "Fix CTS test for updated API" into jb-dev