tree 05b6d20beb876489afef716b3387ce0e30c0c26b
parent f22a0d04420d58630582d4a6ce9c0ff873e3b861
parent a169f465262d05d13c61a177c3110010ff88c61a
author Jean-Baptiste Queru <jbq@google.com> 1345165599 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1345165599 -0700

Merge "auto-generated blob list" into jb-mr1-dev