summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2012-07-17 12:17:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-17 12:17:10 -0700
commit92c4339bb73a58378e510242c6ccdb093ae1a5a9 (patch)
tree87d998c8f8be3ab10e97966bef8088476fc05826 /core/res
parent90cc1811245dde00ec23c390e4cba6345368b265 (diff)
parent1c185c2068212c78d124897fdfe33cebb194d84a (diff)
downloadframeworks_base-92c4339bb73a58378e510242c6ccdb093ae1a5a9.zip
frameworks_base-92c4339bb73a58378e510242c6ccdb093ae1a5a9.tar.gz
frameworks_base-92c4339bb73a58378e510242c6ccdb093ae1a5a9.tar.bz2
am 1c185c20: Merge "Doc change: Fixes to IAB purchase state docs." into jb-dev
* commit '1c185c2068212c78d124897fdfe33cebb194d84a': Doc change: Fixes to IAB purchase state docs.
Diffstat (limited to 'core/res')
0 files changed, 0 insertions, 0 deletions