OSDN Git Service

am 12d729c6: am 568e8f39: Merge "Fix 496 test."
authorNicolas Geoffray <ngeoffray@google.com>
Tue, 23 Jun 2015 16:16:52 +0000 (16:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 23 Jun 2015 16:16:52 +0000 (16:16 +0000)
commit21b12c35ae6dbdd10714a8f3b8b6a9e18795b2f7
tree5c606d9ceb92d746b620733dcc03969b794fa093
parentb0b2e9b21f40866ba55c8b800e9ff960da2e848f
parent12d729c6bd3b4b0eb730038a97e292bfa556c99d
am 12d729c6: am 568e8f39: Merge "Fix 496 test."

* commit '12d729c6bd3b4b0eb730038a97e292bfa556c99d':
  Fix 496 test.