| commit | eb9e78bbe8b11730673abaf240449ad6957aef72 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Tue Jun 30 21:30:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 21:30:43 2015 +0000 |
| tree | 706f5c43d850ec9ba83df2c34627469d5b279a42 | |
| parent | ac15484cfa6bd8dfbd02214cfc1e71bc129bae7e [diff] | |
| parent | ce3bf9894b2de850824150a98bee331d37439891 [diff] |
am ce3bf989: resolved conflicts for merge of 54120079 to mnc-dev-plus-aosp * commit 'ce3bf9894b2de850824150a98bee331d37439891': Retry adjusting the size computation for reserved blocks.