| commit | 9f791ad809b3dcdd6e7186493fb9d01d7ad5c124 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 30 01:19:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 01:19:41 2014 +0000 |
| tree | 50d7b24dca09a3a6aa1dba5c531305c44c6f4ec9 | |
| parent | bd0070cf5558de92076e0c4035403e5bdd5078d4 [diff] | |
| parent | 1333e012ee65fef59f5f43f33744230574dfc2a2 [diff] |
am 1333e012: Merge commit \'4102af05a86aae36d2560fd8b3f740a52399342c\' into HEAD * commit '1333e012ee65fef59f5f43f33744230574dfc2a2':