commit | a9249322d554fa13eb9c2662d39be256f833404f | [log] [tgz] |
---|---|---|
author | Sascha Prueter <saschap@google.com> | Mon Nov 18 23:31:11 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 18 23:31:11 2013 -0800 |
tree | 313faa1acf933a504d2a90e5152bfdcd7beb7f13 | |
parent | fa331b1dfbf3e071e2ff48dbe21727452bfb8042 [diff] | |
parent | c7f7d1bf18dded61bcbf4015a4cfc9cf1ee45bd4 [diff] |
am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." into klp-dev * commit 'c7f7d1bf18dded61bcbf4015a4cfc9cf1ee45bd4': Trying to unbreak build...