OSDN Git Service

Reconcile with jb-dev - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Wed, 3 Oct 2012 22:28:18 +0000 (15:28 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 3 Oct 2012 22:28:20 +0000 (15:28 -0700)
commit7a447b30f6f58445bfa040958a9fa5f392296aaa
tree1467f59e4da6ed6c9b1eb5417d2edf3694ebae5d
parent2f4c73d9995158522bd18db125232838afd099e8
parente311bb72205569675f36784ad67d5bd950a944b8
Reconcile with jb-dev - do not merge

Change-Id: Icd05cc41786c59d592e51e5e0b7a4296a4a1cf57