OSDN Git Service

am 9f6353e0: (-s ours) am c5fd92a3: am 423854bf: am 934b04d3: (-s ours) am 27fad66a...
authorDianne Hackborn <hackbod@google.com>
Fri, 12 Dec 2014 20:20:53 +0000 (20:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Dec 2014 20:20:53 +0000 (20:20 +0000)
* commit '9f6353e014aa54014e57e881bb4281537cf09e1f':
  DO NOT MERGE.  Bump version to 5.0.2.


Trivial merge