OSDN Git Service

am f029447f: (-s ours) Merge "DO NOT MERGE: Javadoc fix." into lmp-preview-dev
authorRuben Brunk <rubenbrunk@google.com>
Fri, 23 May 2014 20:13:44 +0000 (20:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 23 May 2014 20:13:44 +0000 (20:13 +0000)
commit3df29eb31f53b1b99305948b548cef78a9179cde
tree95ce50706ad83beb174c80a7cda82bac95eddd92
parente48fb064ac78279cdd0c048759c54ccb8e3ad9bd
parentdb67ffd62bc0dda9a064a6ae83c40dc9dafd9956
am f029447f: (-s ours) Merge "DO NOT MERGE: Javadoc fix." into lmp-preview-dev

* commit 'f029447fa014c9d3728c16860d00a713edad5c1e':
  DO NOT MERGE: Javadoc fix.