| commit | c0bffb629f7dc431c6d458956e615d13231edcfa | [log] [tgz] |
|---|---|---|
| author | Max Cai <maxtroy@google.com> | Wed Aug 20 20:48:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 20 20:48:36 2014 +0000 |
| tree | 6931963b83b155148dd0bacd7d806665a62b36d8 | |
| parent | 6ca2db13d632e79b7ddde073f5693cf648ee8ee0 [diff] | |
| parent | fafcc5b4f42837ab05c9cf1f390e7e4a6b370f2e [diff] |
am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields." * commit 'fafcc5b4f42837ab05c9cf1f390e7e4a6b370f2e':