| commit | c408cca048911aa5c8adec1cac71d83a96e13ac1 | [log] [tgz] |
|---|---|---|
| author | Yigit Boyar <yboyar@google.com> | Sat Mar 28 02:33:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 28 02:33:37 2015 +0000 |
| tree | 5206cdde9bb84dcf77ee6a0b290c8f2629da5f7b | |
| parent | 599ee673eebbde49283f489cb8f3c800d68dca89 [diff] | |
| parent | f8d4f9500fdfd661501483884d4fc5ba18dd043e [diff] |
am f8d4f950: am 0e05841e: resolved conflicts for merge of bcb644f8 to lmp-mr1-dev-plus-aosp * commit 'f8d4f9500fdfd661501483884d4fc5ba18dd043e': ISSUE-144101: change children size calculation