OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc52ca2 4ddfaeb)
am 4ddfaeb5: Merge "sdk doc change: Added KeyChain API Demo" into ics-mr1
authorTony Chan <htchan@google.com>
Sat, 31 Mar 2012 09:15:57 +0000 (02:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 31 Mar 2012 09:15:57 +0000 (02:15 -0700)
* commit '4ddfaeb5fe29d5dd3dbfd525e97723a972ea5a65':
  sdk doc change: Added KeyChain API Demo

1  2 
Android.mk patch | diff1 | diff2 | blob | history

diff --cc Android.mk
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help