commit | d2cd5e6377768370246ddb4eb510a6a4b43398ab | [log] [tgz] |
---|---|---|
author | Linux Build Service Account <lnxbuild@localhost> | Thu Jan 24 06:29:11 2013 -0800 |
committer | Gerrit - the friendly Code Review server <code-review@localhost> | Thu Jan 24 06:29:11 2013 -0800 |
tree | f461f0362c5287ab932641f665ed739c74fe4dde | |
parent | 8e0540bbb951b7399e475c6c33db38bbff11eecc [diff] | |
parent | 879d0c2ffe1193eedea9b631c12a52aadd1059f4 [diff] |
Merge "Merge commit 'android-4.2.1_r1' into merge_branch"