commit | dbd5ecad26e39281bb83f97664bc32555c5c071a | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Wed May 09 13:53:37 2012 -0700 |
committer | Elliott Hughes <enh@google.com> | Wed May 09 13:53:37 2012 -0700 |
tree | 1d652ad548a322f09cb77e8f5fce98eb7892fbd0 | |
parent | 58a00b4977b6fa073a8f56d94d741b1e4cb49856 [diff] | |
parent | e54089079b123b207e171c14b2b0dca23c9386f3 [diff] |
resolved conflicts for merge of e5408907 to jb-dev-plus-aosp Change-Id: If4c3f51bf87b28da8074be2e46ae772a374b266f