| commit | dcbae47a77020e031f091a4298b05e5214d7b5f0 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Sun Oct 26 22:48:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 26 22:48:22 2014 +0000 |
| tree | 441ca9a473b409bfe1c89324c0c08129160b0542 | |
| parent | bc08997439bc12cf793564762da67c8094c79116 [diff] | |
| parent | 080035f3d1ae8b18efe93254b392e309fbb42b31 [diff] |
am 080035f3: am c9f5845a: am 75b7f959: am 2b5a3d1f: am 0f2dac0f: resolved conflicts for merge of 69c63910 to jb-mr2-dev-plus-aosp * commit '080035f3d1ae8b18efe93254b392e309fbb42b31':