OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de8ac60 04a36f7)
am 04a36f70: Merge "add page for google IO videos this is a scrappy page with inline...
authorScott Main <smain@google.com>
Wed, 29 May 2013 22:15:58 +0000 (15:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 May 2013 22:15:58 +0000 (15:15 -0700)
* commit '04a36f704ac2c646ebc4c29f6b26f3c907dab7f8':
  add page for google IO videos this is a scrappy page with inline styles and such as a first iteration. plan is to clean this up and make it extensible later


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help