OSDN Git Service

Reconcile with mr1.1-release
authorJean-Baptiste Queru <jbq@google.com>
Wed, 17 Apr 2013 21:17:15 +0000 (14:17 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 17 Apr 2013 21:20:24 +0000 (14:20 -0700)
commitf7e5c424080c75e003115aa248c90468c0b9b00a
tree97ee1e9c66468b5ea703e787079e707c81d1d4ff
parentb1578404624f2369bb92a1e69c02f2ef15372002
parentf03d227b09d0bc3e1b2342811d5106aa7749fad0
Reconcile with mr1.1-release

Change-Id: I61e5c59ba2ba1e1072440cc46202a88d3f89c1f7