OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab023c9 69fd61c)
am 69fd61cb: am a8bbebd4: am b5e47228: Add StrongAuthTracker
authorAdrian Roos <roosa@google.com>
Sat, 22 Aug 2015 00:40:47 +0000 (00:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 22 Aug 2015 00:40:47 +0000 (00:40 +0000)
* commit '69fd61cb9a487e5993098c93113d86c4fb32c304':
  Add StrongAuthTracker

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

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